* nsterm.m (ns_mouse_position): Use NS_FRAME_P instead of checking

f->output_data.ns.

diff --git a/src/ChangeLog b/src/ChangeLog
index c3517f40263cfa8bbe0229def986f198c4449639..ab44451845413dfba1b386ca2d0f19980c10b75a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-31  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (ns_mouse_position): Use NS_FRAME_P instead of checking
+       f->output_data.ns.
+
 2013-04-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).

diff --git a/src/nsterm.m b/src/nsterm.m
index bc3150c0a075d970e3a7f99d9b269ea2e8f56e02..f5b48ee4b112d01411089d9f2e2af0aa8c23d369 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1883,7 +1883,7 @@ ns_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
         f = dpyinfo->x_focus_frame ? dpyinfo->x_focus_frame
                                     : SELECTED_FRAME ();
 
-      if (f && f->output_data.ns)  /* TODO: 2nd check no longer needed? */
+      if (f && FRAME_NS_P (f))
         {
           view = FRAME_NS_VIEW (*fp);